(shrink-window-if-larger-than-buffer): Moved from electric.el to windows.el,

minor bug fix.  This is to avoid code duplication between vc.el,
electric.el, and finder.el.

(ctl-x-map): Added C-x - and C-x + as bindings for
shrink-window-if-larger-than-buffer and balance-windows respectively.
Since shrink-window-if-larger-than-buffer has to live here anyhow, let
users use it to manage screen space.

diff --git a/lisp/window.el b/lisp/window.el
index 089b4f3b4ff24b73c3555f785022d99816595595..840035a4af8bbc4aeed5026c9e2f4bf4088b3895 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -109,9 +109,42 @@ ARG columns.  No arg means split equally."
   (interactive "p")
   (shrink-window arg t))
 
+(defun shrink-window-if-larger-than-buffer (&optional window)
+  "Shrink the WINDOW to be as small as possible to display its contents.  Do
+nothing if only one window is displayed or if the buffer contains more lines
+than the present window height."
+  (save-excursion
+    (set-buffer (window-buffer window))
+    (let ((w (selected-window)) ;save-window-excursion can't win
+         (buffer-file-name buffer-file-name)
+         (p (point))
+         (n 0)
+         (window-min-height 0)
+         (buffer-read-only nil)
+         (modified (buffer-modified-p))
+         (buffer (current-buffer)))
+      (unwind-protect
+         (progn
+           (select-window (or window w))
+           (goto-char (point-min))
+           (while (pos-visible-in-window-p (point-max))
+             ;; defeat file locking... don't try this at home, kids!
+             (setq buffer-file-name nil)
+             (insert ?\n) (setq n (1+ n)))
+           (if (> n 0) (shrink-window (1- n))))
+       (delete-region (point-min) (point))
+       (set-buffer-modified-p modified)
+       (goto-char p)
+       (select-window w)
+       ;; Make sure we unbind buffer-read-only
+       ;; with the proper current buffer.
+       (set-buffer buffer)))))
+      
 (define-key ctl-x-map "2" 'split-window-vertically)
 (define-key ctl-x-map "3" 'split-window-horizontally)
 (define-key ctl-x-map "}" 'enlarge-window-horizontally)
 (define-key ctl-x-map "{" 'shrink-window-horizontally)
+(define-key ctl-x-map "-" 'shrink-window-if-larger-than-buffer)
+(define-key ctl-x-map "+" 'balance-windows)
 
 ;;; windows.el ends here